property override and shiro default #2
Open
simonjupp wants to merge 8 commits intodiachron:masterfrom
Open
Conversation
Author
|
I'm also removing the tests that are in the source. They have a dependancy on the archive. These shouldn't be in here. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
These changes allow us to to specify the location of a config file using the system property "diachron.config.location" that will override any default properties specified in the supplied properties file. This means we can maintain our config outside of the source code and deploy a single war to multiple production environments. I've generated similar pull requests so that this property is picked up by both the archive and the detection_repair modules, so we can easily consolidate our configurations.
I've also added a shiro.ini to the resource folder, that means we have a default configuration and we no longer have to modify the web.xml with our path to the apache shiro properties file.
Finally I've removed the target directory from version control. You should add target to your .gitignore